auto merge of #996 : alexcrichton/cargo/issue-953, r=huonw
authorbors <bors@rust-lang.org>
Sun, 30 Nov 2014 06:59:15 +0000 (06:59 +0000)
committerbors <bors@rust-lang.org>
Sun, 30 Nov 2014 06:59:15 +0000 (06:59 +0000)
Closes #953


Trivial merge